Merge remote-tracking branch 'upstream/master' into alt-registry-publish-wip
authorChris Swindle <christopher.swindle@metaswitch.com>
Wed, 1 Nov 2017 19:55:47 +0000 (19:55 +0000)
committerChris Swindle <christopher.swindle@metaswitch.com>
Wed, 1 Nov 2017 19:55:47 +0000 (19:55 +0000)
commit8714f5ffd935443daf304feb36d037acc18e9ca2
treedba99156f651266c5c9c9e82d77cf84f214f0ac6
parentc86a7bcd9b07c1e193048532a9cb4c288941eb72
parent551b62b64f46cd3d2b26319669dc57b8855f7634
Merge remote-tracking branch 'upstream/master' into alt-registry-publish-wip
src/cargo/core/manifest.rs
src/cargo/ops/registry.rs
src/cargo/util/toml/mod.rs
tests/publish.rs